Typo fixes and options update

diff --git a/gpsbabel/README b/gpsbabel/README
index a383ede79a5a0e36cbdf24299ddbd63d81b7f21a..798853de39845616f9056c7de768f6d1b032bf32 100644 (file)
--- a/gpsbabel/README
+++ b/gpsbabel/README
@@ -1186,7 +1186,7 @@ THE FORMATS
        format. "Character" means special data lines can have their own
        separator. 
        
-       Since release 6.1 GPX is a also a supported import/export format for
+       Since release 6.1 GPX is also a supported import/export format for
        waypoints, routes and tracks.
        
        For more information please have a look at
@@ -1195,8 +1195,11 @@ THE FORMATS
        
        Options:
        
-           index: Index of route/track 
-           snlen: Length of generated short names (default 16)
+            deficon: Default icon name
+           index:   Use route/track number <index> from input data for output.
+           radius:  Give points (waypoints/route points) 
+                    a default radius (proximity)
+           snlen:   Length of generated short names (default 16)
 
 
 DATA FILTERS

diff --git a/gpsbabel/compegps.c b/gpsbabel/compegps.c
index 7f517512fc21592bda1f61c19de4fbfee964227e..40704f992410c79772d8e9d7e82730125f5cc6f4 100644 (file)
--- a/gpsbabel/compegps.c
+++ b/gpsbabel/compegps.c
@@ -92,7 +92,7 @@ arglist_t compegps_args[] = {
                NULL, ARGTYPE_STRING},
        {"index", &option_index, "Index of route/track to write (if more the one in source)", 
                NULL, ARGTYPE_INT},
-       {"radius", &option_radius, "Give points (waypoints/route points) a default radius", 
+       {"radius", &option_radius, "Give points (waypoints/route points) a default radius (proximity)", 
                NULL, ARGTYPE_FLOAT},
        {"snlen", &option_snlen, "Length of generated shortnames (default 16)", 
                NULL, ARGTYPE_INT},
@@ -434,7 +434,7 @@ write_waypt_cb(const waypoint *wpt)
        {
                char *icon = option_icon;
                
-               if (wpt->icon_descr != NULL) icon = wpt->icon_descr;
+               if (wpt->icon_descr != NULL) icon = (char *) wpt->icon_descr;
                        
                fprintf(fout, "w  %s,0,0.0,16777215,255,1,7,,%.1f\n",
                        (icon != NULL) ? icon : "Waypoint",
@@ -491,7 +491,7 @@ write_trkpt_cb(const waypoint *wpt)
        
        if (wpt->creation_time != 0)
        {
-               char *cx = &buff;
+               char *cx = buff;
                tm = *gmtime(&wpt->creation_time);
                strftime(buff, sizeof(buff), "%d-%b-%y %H:%M:%S", &tm);
                while (*cx != '\0')